Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc Makefile.in
index 3115e63025f5087ee82245e41d04bf6082e7d417,65eceb2a0c9088a49ed683cf1476d0381c1047f2..71f761eb40f27ed3d9137b3116f41dc006e15e71
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -869,8 -863,7 +870,7 @@@ clean_dirs = $(mostlyclean_dirs) nextst
  
  $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
  
 -clean: $(clean_dirs:=_clean)
 +clean: $(clean_dirs:=_clean) clean-gsettings-schemas
-       [ ! -d test ] || $(MAKE) -C test $@
        -rm -f ./*.tmp etc/*.tmp*
        -rm -rf info-dir.*
        -rm -rf native-lisp

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/mwheel.el
Simple merge

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc lisp/server.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge